Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bz2242346 prometheus port (backport #7613) #7614

Merged
merged 2 commits into from
Oct 16, 2024
Merged

Bz2242346 prometheus port (backport #7613) #7614

merged 2 commits into from
Oct 16, 2024

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Oct 14, 2024

cephadm_adopt does not keep Prometheus custom port during adoption

Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=2242346

This is an automatic backport of pull request #7613 done by Mergify.

@asm0deuz @mergify
cephadm-adopt: custom prometheus port lost after adoption
5e7ceff 
If a custom Prometheus port was used before adoption, it was not
taken into account and default 9095 was set instead. Now custom
port is re-applied.

Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=2242346

Signed-off-by: Teoman ONAY <[email protected]>
(cherry picked from commit b41b7bf)

# Conflicts:
#	infrastructure-playbooks/cephadm-adopt.yml
@mergify Mergify
Copy link
Author

mergify bot commented Oct 14, 2024

Cherry-pick of b41b7bf has failed:

On branch mergify/bp/stable-7.0/pr-7613
Your branch is up to date with 'origin/stable-7.0'.

You are currently cherry-picking commit b41b7bf86.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   infrastructure-playbooks/cephadm-adopt.yml

no changes added to commit (use "git add" and/or "git commit -a")

Cherry-pick of 31be495 has failed:

On branch mergify/bp/stable-7.0/pr-7613
Your branch is ahead of 'origin/stable-7.0' by 1 commit.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 31be49506.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   infrastructure-playbooks/cephadm-adopt.yml

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@mergify mergify bot added the conflicts label Oct 14, 2024
@asm0deuz
ephadm-adopt: Alertmanager placement count missing
f8bd922 
Regression from #7576. Alertmanager placement count was missing
after migration to ceph_orch_apply module

Signed-off-by: Teoman ONAY <[email protected]>
(cherry picked from commit 31be495)
@asm0deuz asm0deuz force-pushed the mergify/bp/stable-7.0/pr-7613 branch from b0a990c to f8bd922 Compare October 14, 2024 13:04
asm0deuz
asm0deuz approved these changes Oct 16, 2024
View reviewed changes
Copy link
Collaborator

@asm0deuz asm0deuz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@asm0deuz asm0deuz merged commit efa91ad into stable-7.0 Oct 16, 2024
26 of 27 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@asm0deuz asm0deuz asm0deuz approved these changes

Assignees
No one assigned
Labels
conflicts
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@asm0deuz